集成友盟统计
共有 10 个文件被更改，包括 30 次插入 和 9 次删除
+ 1
- 1
.idea/gradle.xml
@@ -5,7 +5,7 @@ |
||
| 5 | 5 |
<GradleProjectSettings> |
| 6 | 6 |
<option name="distributionType" value="LOCAL" /> |
| 7 | 7 |
<option name="externalProjectPath" value="$PROJECT_DIR$" /> |
| 8 |
- <option name="gradleHome" value="C:/Android/gradle-3.0" /> |
|
| 8 |
+ <option name="gradleHome" value="C:/Android/gradle-3.3" /> |
|
| 9 | 9 |
<option name="modules"> |
| 10 | 10 |
<set> |
| 11 | 11 |
<option value="$PROJECT_DIR$" /> |
+ 1
- 1
.idea/misc.xml
@@ -37,7 +37,7 @@ |
||
| 37 | 37 |
<ConfirmationsSetting value="0" id="Add" /> |
| 38 | 38 |
<ConfirmationsSetting value="0" id="Remove" /> |
| 39 | 39 |
</component> |
| 40 |
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> |
|
| 40 |
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> |
|
| 41 | 41 |
<output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | 42 |
</component> |
| 43 | 43 |
<component name="ProjectType"> |
+ 2
- 1
app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application' |
||
| 2 | 2 |
|
| 3 | 3 |
android {
|
| 4 | 4 |
compileSdkVersion 24 |
| 5 |
- buildToolsVersion "24.0.3" |
|
| 5 |
+ buildToolsVersion "25.0.2" |
|
| 6 | 6 |
|
| 7 | 7 |
compileOptions {
|
| 8 | 8 |
sourceCompatibility JavaVersion.VERSION_1_7 |
@@ -76,4 +76,5 @@ dependencies {
|
||
| 76 | 76 |
compile project(path: ':common') |
| 77 | 77 |
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' |
| 78 | 78 |
compile project(path: ':views') |
| 79 |
+ compile 'com.umeng.analytics:analytics:latest.integration' |
|
| 79 | 80 |
} |
+ 7
- 0
app/proguard-project.txt
@@ -40,6 +40,10 @@ |
||
| 40 | 40 |
public static <fields>; |
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 |
+-keep public class ai.pai.client.R$*{
|
|
| 44 |
+public static final int *; |
|
| 45 |
+} |
|
| 46 |
+ |
|
| 43 | 47 |
-ignorewarnings |
| 44 | 48 |
|
| 45 | 49 |
-keep class android.support.v4.**{*;}
|
@@ -76,6 +80,9 @@ |
||
| 76 | 80 |
|
| 77 | 81 |
-keep class com.tencent.** {*;}
|
| 78 | 82 |
-dontwarn com.tencent.** |
| 83 |
+-keepclassmembers class * {
|
|
| 84 |
+ public <init> (org.json.JSONObject); |
|
| 85 |
+} |
|
| 79 | 86 |
-keep public class com.umeng.soexample.R$*{
|
| 80 | 87 |
public static final int *; |
| 81 | 88 |
} |
+ 13
- 0
app/src/main/java/ai/pai/client/activity/BaseActivity.java
@@ -6,6 +6,7 @@ import android.view.View; |
||
| 6 | 6 |
import android.widget.Toast; |
| 7 | 7 |
|
| 8 | 8 |
import com.android.common.utils.NetworkUtil; |
| 9 |
+import com.umeng.analytics.MobclickAgent; |
|
| 9 | 10 |
|
| 10 | 11 |
import ai.pai.client.R; |
| 11 | 12 |
import ai.pai.client.swipelayout.SwipeBackActivityBase; |
@@ -40,6 +41,18 @@ public class BaseActivity extends FragmentActivity implements SwipeBackActivityB |
||
| 40 | 41 |
} |
| 41 | 42 |
|
| 42 | 43 |
@Override |
| 44 |
+ protected void onResume() {
|
|
| 45 |
+ super.onResume(); |
|
| 46 |
+ MobclickAgent.onResume(this); |
|
| 47 |
+ } |
|
| 48 |
+ |
|
| 49 |
+ @Override |
|
| 50 |
+ protected void onPause() {
|
|
| 51 |
+ super.onPause(); |
|
| 52 |
+ MobclickAgent.onPause(this); |
|
| 53 |
+ } |
|
| 54 |
+ |
|
| 55 |
+ @Override |
|
| 43 | 56 |
public View findViewById(int id) {
|
| 44 | 57 |
View v = super.findViewById(id); |
| 45 | 58 |
if (v == null && mHelper != null) |
+ 1
- 1
app/src/main/java/ai/pai/client/app/PaiAiApplication.java
@@ -26,7 +26,7 @@ public class PaiAiApplication extends Application {
|
||
| 26 | 26 |
LogHelper.setLogEnable(BuildConfig.isDevMode); |
| 27 | 27 |
Log.LOG=false; |
| 28 | 28 |
Config.IsToastTip=false; |
| 29 |
- CrashHandler.getInstance().init(this); |
|
| 29 |
+// CrashHandler.getInstance().init(this); |
|
| 30 | 30 |
PlatformConfig.setWeixin("wx4e22a0c8ae6d766d", "636ac848016c593575d11143c55c8333");
|
| 31 | 31 |
PlatformConfig.setQQZone("1105111674","OFQ2J1RBMJyHPW8G");
|
| 32 | 32 |
PlatformConfig.setSinaWeibo("2730190333","ff16591583c7bcf4a0d781eae316635a");
|
+ 1
- 1
build.gradle
@@ -4,7 +4,7 @@ buildscript {
|
||
| 4 | 4 |
jcenter() |
| 5 | 5 |
} |
| 6 | 6 |
dependencies {
|
| 7 |
- classpath 'com.android.tools.build:gradle:2.2.3' |
|
| 7 |
+ classpath 'com.android.tools.build:gradle:2.3.0' |
|
| 8 | 8 |
|
| 9 | 9 |
// NOTE: Do not place your application dependencies here; they belong |
| 10 | 10 |
// in the individual module build.gradle files |
+ 1
- 1
common/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' |
||
| 2 | 2 |
|
| 3 | 3 |
android {
|
| 4 | 4 |
compileSdkVersion 24 |
| 5 |
- buildToolsVersion "24.0.3" |
|
| 5 |
+ buildToolsVersion "25.0.2" |
|
| 6 | 6 |
|
| 7 | 7 |
defaultConfig {
|
| 8 | 8 |
minSdkVersion 14 |
+ 2
- 2
gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@ |
||
| 1 |
-#Thu Feb 09 21:51:20 CST 2017 |
|
| 1 |
+#Sun Mar 05 10:46:30 CST 2017 |
|
| 2 | 2 |
distributionBase=GRADLE_USER_HOME |
| 3 | 3 |
distributionPath=wrapper/dists |
| 4 | 4 |
zipStoreBase=GRADLE_USER_HOME |
| 5 | 5 |
zipStorePath=wrapper/dists |
| 6 |
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |
|
| 6 |
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip |
+ 1
- 1
views/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' |
||
| 2 | 2 |
|
| 3 | 3 |
android {
|
| 4 | 4 |
compileSdkVersion 24 |
| 5 |
- buildToolsVersion "24.0.3" |
|
| 5 |
+ buildToolsVersion "25.0.2" |
|
| 6 | 6 |
|
| 7 | 7 |
defaultConfig {
|
| 8 | 8 |
minSdkVersion 14 |